inspector: Rename "Gestures" page to "Controllers"
authorBenjamin Otte <otte@redhat.com>
Tue, 11 Sep 2018 00:25:37 +0000 (02:25 +0200)
committerBenjamin Otte <otte@redhat.com>
Sun, 16 Sep 2018 16:50:17 +0000 (18:50 +0200)
And rename GtkInspectorGestures => GtkInspectorControllers, too.

gtk/inspector/controllers.c [new file with mode: 0644]
gtk/inspector/controllers.h [new file with mode: 0644]
gtk/inspector/gestures.c [deleted file]
gtk/inspector/gestures.h [deleted file]
gtk/inspector/init.c
gtk/inspector/meson.build
gtk/inspector/window.c
gtk/inspector/window.h
gtk/inspector/window.ui

diff --git a/gtk/inspector/controllers.c b/gtk/inspector/controllers.c
new file mode 100644 (file)
index 0000000..e52ea45
--- /dev/null
@@ -0,0 +1,231 @@
+/*
+ * Copyright (c) 2014 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+#include <glib/gi18n-lib.h>
+
+#include "controllers.h"
+#include "object-tree.h"
+
+#include "gtksizegroup.h"
+#include "gtkcomboboxtext.h"
+#include "gtklistbox.h"
+#include "gtkgesture.h"
+#include "gtklabel.h"
+#include "gtkframe.h"
+#include "gtkwidgetprivate.h"
+
+enum
+{
+  PROP_0,
+  PROP_OBJECT_TREE
+};
+
+struct _GtkInspectorControllersPrivate
+{
+  GtkWidget *listbox;
+  GtkSizeGroup *sizegroup;
+  GtkInspectorObjectTree *object_tree;
+};
+
+G_DEFINE_TYPE_WITH_PRIVATE (GtkInspectorControllers, gtk_inspector_controllers, GTK_TYPE_BOX)
+
+static void
+row_activated (GtkListBox              *box,
+               GtkListBoxRow           *row,
+               GtkInspectorControllers *sl)
+{
+  GObject *controller;
+  
+  controller = G_OBJECT (g_object_get_data (G_OBJECT (row), "controller"));
+  gtk_inspector_object_tree_select_object (sl->priv->object_tree, controller);
+}
+
+static void
+gtk_inspector_controllers_init (GtkInspectorControllers *sl)
+{
+  GtkWidget *frame;
+
+  sl->priv = gtk_inspector_controllers_get_instance_private (sl);
+  sl->priv->sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+  g_object_set (sl,
+                "orientation", GTK_ORIENTATION_VERTICAL,
+                "margin-start", 60,
+                "margin-end", 60,
+                "margin-top", 60,
+                "margin-bottom", 30,
+                "spacing", 10,
+                NULL);
+
+  frame = gtk_frame_new (NULL);
+  gtk_widget_show (frame);
+  gtk_widget_set_halign (frame, GTK_ALIGN_CENTER);
+
+  sl->priv->listbox = gtk_list_box_new ();
+  g_signal_connect (sl->priv->listbox, "row-activated", G_CALLBACK (row_activated), sl);
+  gtk_container_add (GTK_CONTAINER (frame), sl->priv->listbox);
+  gtk_list_box_set_selection_mode (GTK_LIST_BOX (sl->priv->listbox), GTK_SELECTION_NONE);
+
+  gtk_container_add (GTK_CONTAINER (sl), frame);
+
+}
+
+static void
+clear_all (GtkInspectorControllers *sl)
+{
+  GList *children, *l;
+  GtkWidget *child;
+
+  children = gtk_container_get_children (GTK_CONTAINER (sl->priv->listbox));
+  for (l = children; l; l = l->next)
+    {
+      child = l->data;
+      gtk_container_remove (GTK_CONTAINER (sl->priv->listbox), child);
+    }
+  g_list_free (children);
+}
+
+static void
+phase_changed_cb (GtkComboBox             *combo,
+                  GtkInspectorControllers *sl)
+{
+  GtkWidget *row;
+  GtkPropagationPhase phase;
+  GtkEventController *controller;
+
+  phase = gtk_combo_box_get_active (combo);
+  row = gtk_widget_get_ancestor (GTK_WIDGET (combo), GTK_TYPE_LIST_BOX_ROW);
+  controller = GTK_EVENT_CONTROLLER (g_object_get_data (G_OBJECT (row), "controller"));
+  gtk_event_controller_set_propagation_phase (controller, phase);
+}
+
+static void
+add_controller (GtkInspectorControllers *sl,
+                GObject                 *object,
+                GtkEventController      *controller)
+{
+  GtkWidget *row;
+  GtkWidget *box;
+  GtkWidget *label;
+  GtkWidget *combo;
+
+  row = gtk_list_box_row_new ();
+  gtk_container_add (GTK_CONTAINER (sl->priv->listbox), row);
+  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 40);
+  gtk_container_add (GTK_CONTAINER (row), box);
+  g_object_set (box, "margin", 10, NULL);
+  gtk_widget_show (box);
+  label = gtk_label_new (G_OBJECT_TYPE_NAME (controller));
+  g_object_set (label, "xalign", 0.0, NULL);
+  gtk_container_add (GTK_CONTAINER (box), label);
+  gtk_size_group_add_widget (sl->priv->sizegroup, label);
+  gtk_widget_show (label);
+  gtk_widget_set_halign (label, GTK_ALIGN_START);
+  gtk_widget_set_valign (label, GTK_ALIGN_BASELINE);
+
+  combo = gtk_combo_box_text_new ();
+  gtk_combo_box_text_insert_text (GTK_COMBO_BOX_TEXT (combo), GTK_PHASE_NONE, C_("event phase", "None"));
+  gtk_combo_box_text_insert_text (GTK_COMBO_BOX_TEXT (combo), GTK_PHASE_CAPTURE, C_("event phase", "Capture"));
+  gtk_combo_box_text_insert_text (GTK_COMBO_BOX_TEXT (combo), GTK_PHASE_BUBBLE, C_("event phase", "Bubble"));
+  gtk_combo_box_text_insert_text (GTK_COMBO_BOX_TEXT (combo), GTK_PHASE_TARGET, C_("event phase", "Target"));
+  gtk_combo_box_set_active (GTK_COMBO_BOX (combo), gtk_event_controller_get_propagation_phase (controller));
+  gtk_container_add (GTK_CONTAINER (box), combo);
+  gtk_widget_show (combo);
+  gtk_widget_set_halign (label, GTK_ALIGN_END);
+  gtk_widget_set_valign (label, GTK_ALIGN_BASELINE);
+
+  g_object_set_data (G_OBJECT (row), "controller", controller);
+  g_signal_connect (combo, "changed", G_CALLBACK (phase_changed_cb), sl);
+}
+
+void
+gtk_inspector_controllers_set_object (GtkInspectorControllers *sl,
+                                      GObject                 *object)
+{
+  GtkPropagationPhase phase;
+  GList *list, *l;
+
+  clear_all (sl);
+
+  if (!GTK_IS_WIDGET (object))
+    return;
+
+  for (phase = GTK_PHASE_NONE; phase <= GTK_PHASE_TARGET; phase++)
+    {
+      list = _gtk_widget_list_controllers (GTK_WIDGET (object), phase);
+      for (l = list; l; l = l->next)
+        {
+          add_controller (sl, object, l->data);
+        }
+      g_list_free (list);
+    }
+}
+
+static void
+get_property (GObject    *object,
+              guint       param_id,
+              GValue     *value,
+              GParamSpec *pspec)
+{
+  GtkInspectorControllers *sl = GTK_INSPECTOR_CONTROLLERS (object);
+
+  switch (param_id)
+    {
+      case PROP_OBJECT_TREE:
+        g_value_take_object (value, sl->priv->object_tree);
+        break;
+
+      default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
+        break;
+    }
+}
+
+static void
+set_property (GObject      *object,
+              guint         param_id,
+              const GValue *value,
+              GParamSpec   *pspec)
+{
+  GtkInspectorControllers *sl = GTK_INSPECTOR_CONTROLLERS (object);
+
+  switch (param_id)
+    {
+      case PROP_OBJECT_TREE:
+        sl->priv->object_tree = g_value_get_object (value);
+        break;
+
+      default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
+        break;
+    }
+}
+
+static void
+gtk_inspector_controllers_class_init (GtkInspectorControllersClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->get_property = get_property;
+  object_class->set_property = set_property;
+
+  g_object_class_install_property (object_class, PROP_OBJECT_TREE,
+      g_param_spec_object ("object-tree", "Widget Tree", "Widget tree",
+                           GTK_TYPE_WIDGET, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+}
+
+// vim: set et sw=2 ts=2:
diff --git a/gtk/inspector/controllers.h b/gtk/inspector/controllers.h
new file mode 100644 (file)
index 0000000..a0f9f8c
--- /dev/null
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2014 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _GTK_INSPECTOR_CONTROLLERS_H_
+#define _GTK_INSPECTOR_CONTROLLERS_H_
+
+#include <gtk/gtkbox.h>
+
+#define GTK_TYPE_INSPECTOR_CONTROLLERS            (gtk_inspector_controllers_get_type())
+#define GTK_INSPECTOR_CONTROLLERS(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_TYPE_INSPECTOR_CONTROLLERS, GtkInspectorControllers))
+#define GTK_INSPECTOR_CONTROLLERS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), GTK_TYPE_INSPECTOR_CONTROLLERS, GtkInspectorControllersClass))
+#define GTK_INSPECTOR_IS_GESTURES(obj)            (G_TYPE_CHECK_INSTANCE_TYPE((obj), GTK_TYPE_INSPECTOR_CONTROLLERS))
+#define GTK_INSPECTOR_IS_GESTURES_CLASS(klass)    (G_TYPE_CHECK_CLASS_TYPE((klass), GTK_TYPE_INSPECTOR_CONTROLLERS))
+#define GTK_INSPECTOR_CONTROLLERS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), GTK_TYPE_INSPECTOR_CONTROLLERS, GtkInspectorControllersClass))
+
+
+typedef struct _GtkInspectorControllersPrivate GtkInspectorControllersPrivate;
+
+typedef struct _GtkInspectorControllers
+{
+  GtkBox parent;
+  GtkInspectorControllersPrivate *priv;
+} GtkInspectorControllers;
+
+typedef struct _GtkInspectorControllersClass
+{
+  GtkBoxClass parent;
+} GtkInspectorControllersClass;
+
+G_BEGIN_DECLS
+
+GType           gtk_inspector_controllers_get_type              (void);
+
+void            gtk_inspector_controllers_set_object            (GtkInspectorControllers        *sl,
+                                                                 GObject                        *object);
+
+G_END_DECLS
+
+#endif // _GTK_INSPECTOR_CONTROLLERS_H_
+
+// vim: set et sw=2 ts=2:
diff --git a/gtk/inspector/gestures.c b/gtk/inspector/gestures.c
deleted file mode 100644 (file)
index 32f2fd4..0000000
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
- * Copyright (c) 2014 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "config.h"
-#include <glib/gi18n-lib.h>
-
-#include "gestures.h"
-#include "object-tree.h"
-
-#include "gtksizegroup.h"
-#include "gtkcomboboxtext.h"
-#include "gtklistbox.h"
-#include "gtkgesture.h"
-#include "gtklabel.h"
-#include "gtkframe.h"
-#include "gtkwidgetprivate.h"
-
-enum
-{
-  PROP_0,
-  PROP_OBJECT_TREE
-};
-
-struct _GtkInspectorGesturesPrivate
-{
-  GtkWidget *listbox;
-  GtkSizeGroup *sizegroup;
-  GtkInspectorObjectTree *object_tree;
-};
-
-G_DEFINE_TYPE_WITH_PRIVATE (GtkInspectorGestures, gtk_inspector_gestures, GTK_TYPE_BOX)
-
-static void
-row_activated (GtkListBox           *box,
-               GtkListBoxRow        *row,
-               GtkInspectorGestures *sl)
-{
-  GObject *gesture;
-  
-  gesture = G_OBJECT (g_object_get_data (G_OBJECT (row), "gesture"));
-  gtk_inspector_object_tree_select_object (sl->priv->object_tree, gesture);
-}
-
-static void
-gtk_inspector_gestures_init (GtkInspectorGestures *sl)
-{
-  GtkWidget *frame;
-
-  sl->priv = gtk_inspector_gestures_get_instance_private (sl);
-  sl->priv->sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
-  g_object_set (sl,
-                "orientation", GTK_ORIENTATION_VERTICAL,
-                "margin-start", 60,
-                "margin-end", 60,
-                "margin-top", 60,
-                "margin-bottom", 30,
-                "spacing", 10,
-                NULL);
-
-  frame = gtk_frame_new (NULL);
-  gtk_widget_show (frame);
-  gtk_widget_set_halign (frame, GTK_ALIGN_CENTER);
-
-  sl->priv->listbox = gtk_list_box_new ();
-  g_signal_connect (sl->priv->listbox, "row-activated", G_CALLBACK (row_activated), sl);
-  gtk_container_add (GTK_CONTAINER (frame), sl->priv->listbox);
-  gtk_list_box_set_selection_mode (GTK_LIST_BOX (sl->priv->listbox), GTK_SELECTION_NONE);
-
-  gtk_container_add (GTK_CONTAINER (sl), frame);
-
-}
-
-static void
-clear_all (GtkInspectorGestures *sl)
-{
-  GList *children, *l;
-  GtkWidget *child;
-
-  children = gtk_container_get_children (GTK_CONTAINER (sl->priv->listbox));
-  for (l = children; l; l = l->next)
-    {
-      child = l->data;
-      gtk_container_remove (GTK_CONTAINER (sl->priv->listbox), child);
-    }
-  g_list_free (children);
-}
-
-static void
-phase_changed_cb (GtkComboBox *combo, GtkInspectorGestures *sl)
-{
-  GtkWidget *row;
-  GtkPropagationPhase phase;
-  GtkEventController *controller;
-
-  phase = gtk_combo_box_get_active (combo);
-  row = gtk_widget_get_ancestor (GTK_WIDGET (combo), GTK_TYPE_LIST_BOX_ROW);
-  controller = GTK_EVENT_CONTROLLER (g_object_get_data (G_OBJECT (row), "gesture"));
-  gtk_event_controller_set_propagation_phase (controller, phase);
-}
-
-static void
-add_controller (GtkInspectorGestures *sl,
-                GObject              *object,
-                GtkEventController   *controller)
-{
-  GtkWidget *row;
-  GtkWidget *box;
-  GtkWidget *label;
-  GtkWidget *combo;
-
-  row = gtk_list_box_row_new ();
-  gtk_container_add (GTK_CONTAINER (sl->priv->listbox), row);
-  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 40);
-  gtk_container_add (GTK_CONTAINER (row), box);
-  g_object_set (box, "margin", 10, NULL);
-  gtk_widget_show (box);
-  label = gtk_label_new (G_OBJECT_TYPE_NAME (controller));
-  g_object_set (label, "xalign", 0.0, NULL);
-  gtk_container_add (GTK_CONTAINER (box), label);
-  gtk_size_group_add_widget (sl->priv->sizegroup, label);
-  gtk_widget_show (label);
-  gtk_widget_set_halign (label, GTK_ALIGN_START);
-  gtk_widget_set_valign (label, GTK_ALIGN_BASELINE);
-
-  combo = gtk_combo_box_text_new ();
-  gtk_combo_box_text_insert_text (GTK_COMBO_BOX_TEXT (combo), GTK_PHASE_NONE, C_("event phase", "None"));
-  gtk_combo_box_text_insert_text (GTK_COMBO_BOX_TEXT (combo), GTK_PHASE_CAPTURE, C_("event phase", "Capture"));
-  gtk_combo_box_text_insert_text (GTK_COMBO_BOX_TEXT (combo), GTK_PHASE_BUBBLE, C_("event phase", "Bubble"));
-  gtk_combo_box_text_insert_text (GTK_COMBO_BOX_TEXT (combo), GTK_PHASE_TARGET, C_("event phase", "Target"));
-  gtk_combo_box_set_active (GTK_COMBO_BOX (combo), gtk_event_controller_get_propagation_phase (controller));
-  gtk_container_add (GTK_CONTAINER (box), combo);
-  gtk_widget_show (combo);
-  gtk_widget_set_halign (label, GTK_ALIGN_END);
-  gtk_widget_set_valign (label, GTK_ALIGN_BASELINE);
-
-  g_object_set_data (G_OBJECT (row), "gesture", controller);
-  g_signal_connect (combo, "changed", G_CALLBACK (phase_changed_cb), sl);
-}
-
-void
-gtk_inspector_gestures_set_object (GtkInspectorGestures *sl,
-                                   GObject              *object)
-{
-  GtkPropagationPhase phase;
-  GList *list, *l;
-
-  clear_all (sl);
-
-  if (!GTK_IS_WIDGET (object))
-    return;
-
-  for (phase = GTK_PHASE_NONE; phase <= GTK_PHASE_TARGET; phase++)
-    {
-      list = _gtk_widget_list_controllers (GTK_WIDGET (object), phase);
-      for (l = list; l; l = l->next)
-        {
-          add_controller (sl, object, l->data);
-        }
-      g_list_free (list);
-    }
-}
-
-static void
-get_property (GObject    *object,
-              guint       param_id,
-              GValue     *value,
-              GParamSpec *pspec)
-{
-  GtkInspectorGestures *sl = GTK_INSPECTOR_GESTURES (object);
-
-  switch (param_id)
-    {
-      case PROP_OBJECT_TREE:
-        g_value_take_object (value, sl->priv->object_tree);
-        break;
-
-      default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
-        break;
-    }
-}
-
-static void
-set_property (GObject      *object,
-              guint         param_id,
-              const GValue *value,
-              GParamSpec   *pspec)
-{
-  GtkInspectorGestures *sl = GTK_INSPECTOR_GESTURES (object);
-
-  switch (param_id)
-    {
-      case PROP_OBJECT_TREE:
-        sl->priv->object_tree = g_value_get_object (value);
-        break;
-
-      default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
-        break;
-    }
-}
-
-static void
-gtk_inspector_gestures_class_init (GtkInspectorGesturesClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-  object_class->get_property = get_property;
-  object_class->set_property = set_property;
-
-  g_object_class_install_property (object_class, PROP_OBJECT_TREE,
-      g_param_spec_object ("object-tree", "Widget Tree", "Widget tree",
-                           GTK_TYPE_WIDGET, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
-}
-
-// vim: set et sw=2 ts=2:
diff --git a/gtk/inspector/gestures.h b/gtk/inspector/gestures.h
deleted file mode 100644 (file)
index d5c8acb..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2014 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef _GTK_INSPECTOR_GESTURES_H_
-#define _GTK_INSPECTOR_GESTURES_H_
-
-#include <gtk/gtkbox.h>
-
-#define GTK_TYPE_INSPECTOR_GESTURES            (gtk_inspector_gestures_get_type())
-#define GTK_INSPECTOR_GESTURES(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_TYPE_INSPECTOR_GESTURES, GtkInspectorGestures))
-#define GTK_INSPECTOR_GESTURES_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), GTK_TYPE_INSPECTOR_GESTURES, GtkInspectorGesturesClass))
-#define GTK_INSPECTOR_IS_GESTURES(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), GTK_TYPE_INSPECTOR_GESTURES))
-#define GTK_INSPECTOR_IS_GESTURES_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GTK_TYPE_INSPECTOR_GESTURES))
-#define GTK_INSPECTOR_GESTURES_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), GTK_TYPE_INSPECTOR_GESTURES, GtkInspectorGesturesClass))
-
-
-typedef struct _GtkInspectorGesturesPrivate GtkInspectorGesturesPrivate;
-
-typedef struct _GtkInspectorGestures
-{
-  GtkBox parent;
-  GtkInspectorGesturesPrivate *priv;
-} GtkInspectorGestures;
-
-typedef struct _GtkInspectorGesturesClass
-{
-  GtkBoxClass parent;
-} GtkInspectorGesturesClass;
-
-G_BEGIN_DECLS
-
-GType      gtk_inspector_gestures_get_type   (void);
-void       gtk_inspector_gestures_set_object (GtkInspectorGestures *sl,
-                                             GObject             *object);
-
-G_END_DECLS
-
-#endif // _GTK_INSPECTOR_GESTURES_H_
-
-// vim: set et sw=2 ts=2:
index d16c03eaf27029d5d9df7a88986f9bb4aba9a21c..049126f4018dc378727f8013b9ec5850c93163d4 100644 (file)
 
 #include "actions.h"
 #include "cellrenderergraph.h"
+#include "controllers.h"
 #include "css-editor.h"
 #include "css-node-tree.h"
 #include "data-list.h"
 #include "general.h"
-#include "gestures.h"
 #include "graphdata.h"
 #include "logs.h"
 #include "magnifier.h"
@@ -63,11 +63,11 @@ gtk_inspector_init (void)
   g_type_ensure (GTK_TYPE_CELL_RENDERER_GRAPH);
   g_type_ensure (GTK_TYPE_GRAPH_DATA);
   g_type_ensure (GTK_TYPE_INSPECTOR_ACTIONS);
+  g_type_ensure (GTK_TYPE_INSPECTOR_CONTROLLERS);
   g_type_ensure (GTK_TYPE_INSPECTOR_CSS_EDITOR);
   g_type_ensure (GTK_TYPE_INSPECTOR_CSS_NODE_TREE);
   g_type_ensure (GTK_TYPE_INSPECTOR_DATA_LIST);
   g_type_ensure (GTK_TYPE_INSPECTOR_GENERAL);
-  g_type_ensure (GTK_TYPE_INSPECTOR_GESTURES);
   g_type_ensure (GTK_TYPE_INSPECTOR_LOGS);
   g_type_ensure (GTK_TYPE_MAGNIFIER);
   g_type_ensure (GTK_TYPE_INSPECTOR_MAGNIFIER);
index 7176b92946dd23bda7046e8e37fddb96bfcffa97..a134f8f278d347ef6c45b75bf34a841db54cc056 100644 (file)
@@ -2,12 +2,12 @@ inspector_sources = files(
   'action-editor.c',
   'actions.c',
   'cellrenderergraph.c',
+  'controllers.c',
   'css-editor.c',
   'css-node-tree.c',
   'data-list.c',
   'fpsoverlay.c',
   'general.c',
-  'gestures.c',
   'graphdata.c',
   'gtkstackcombo.c',
   'gtktreemodelcssnode.c',
index eb7b34da31dd6f6e84dd3a2266089be3154fded4..5f4c1eb07f374e9405d213e972072ee3248556ad 100644 (file)
@@ -29,6 +29,7 @@
 
 #include "window.h"
 #include "prop-list.h"
+#include "controllers.h"
 #include "css-editor.h"
 #include "css-node-tree.h"
 #include "object-hierarchy.h"
@@ -40,7 +41,6 @@
 #include "actions.h"
 #include "menu.h"
 #include "misc-info.h"
-#include "gestures.h"
 #include "magnifier.h"
 #include "recorder.h"
 
@@ -81,7 +81,7 @@ set_selected_object (GtkInspectorWindow *iw,
   gtk_inspector_data_list_set_object (GTK_INSPECTOR_DATA_LIST (iw->data_list), selected);
   gtk_inspector_actions_set_object (GTK_INSPECTOR_ACTIONS (iw->actions), selected);
   gtk_inspector_menu_set_object (GTK_INSPECTOR_MENU (iw->menu), selected);
-  gtk_inspector_gestures_set_object (GTK_INSPECTOR_GESTURES (iw->gestures), selected);
+  gtk_inspector_controllers_set_object (GTK_INSPECTOR_CONTROLLERS (iw->controllers), selected);
   gtk_inspector_magnifier_set_object (GTK_INSPECTOR_MAGNIFIER (iw->magnifier), selected);
 
   for (l = iw->extra_pages; l != NULL; l = l->next)
@@ -287,7 +287,7 @@ gtk_inspector_window_class_init (GtkInspectorWindowClass *klass)
   gtk_widget_class_bind_template_child (widget_class, GtkInspectorWindow, actions);
   gtk_widget_class_bind_template_child (widget_class, GtkInspectorWindow, menu);
   gtk_widget_class_bind_template_child (widget_class, GtkInspectorWindow, misc_info);
-  gtk_widget_class_bind_template_child (widget_class, GtkInspectorWindow, gestures);
+  gtk_widget_class_bind_template_child (widget_class, GtkInspectorWindow, controllers);
   gtk_widget_class_bind_template_child (widget_class, GtkInspectorWindow, magnifier);
 
   gtk_widget_class_bind_template_callback (widget_class, gtk_inspector_on_inspect);
index 26ba277e6bc0bc8132840a01863522edc1f795a2..ed1adfa3dfaaadc1cbc10bfc42312701be2b7f13 100644 (file)
@@ -69,7 +69,7 @@ typedef struct
   GtkWidget *actions;
   GtkWidget *menu;
   GtkWidget *misc_info;
-  GtkWidget *gestures;
+  GtkWidget *controllers;
   GtkWidget *magnifier;
 
   GtkWidget *invisible;
index bd2d8d3bf47b27d340d521f45b79610a2b8aebab..67b97fb0cb8634f8518426e08fcd8864618497d9 100644 (file)
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkInspectorGestures" id="gestures">
+                      <object class="GtkInspectorControllers" id="controllers">
                         <property name="object-tree">object_tree</property>
                       </object>
                       <packing>
-                        <property name="name">gestures</property>
-                        <property name="title" translatable="yes">Gestures</property>
+                        <property name="name">controllers</property>
+                        <property name="title" translatable="yes">Controllers</property>
                       </packing>
                     </child>
                     <child>